Adding helpers functions.
Improved comment for query vars