Revert "fixed bug at standard mapping hql queries"

This reverts commit 0cc9cbf51733bd31781de5189b0fb6d7d613c495.