Added the ability to add expires at query level also