Use gene query logic for all gene table values

Use gene query logic for all gene table values #720