Updated datastore query with proper filter.

* Updated datastore query with proper filter.
* Changed 'constants' class name with 'c'