modified constants file with correct 2NF queries
resolved merge conflicts in Constants