Fix issue where post_query and pre_query are overwritten
Merge pull request #15 from mpchlets/master

Fix issue where post_query and pre_query are overwritten