Common Query modifiers implementation started.
Working on query augmentation.