Adding option to run select/count queries without the distinct option