Revert "Changed case for 2 arguments in query function"

This reverts commit 44db31d3895dbccab30ac1e0384ed63058aa1650.
Reverting previous commit (applied in develop branch instead)
Merge branch 'develop'
fixing upgrade bugs
upgrade fixes
OMG
adding on_cache_flush event
make it possible for google to render page
remove blocks
Merge pull request #1693 from goutnet/add-on_cache_flush-event

adding on_cache_flush event
better styling in safari
fixing some issues with sample content import and page feeds
Merge pull request #1698 from Remo/patch-2

make it possible for google to render site
adding resizable back
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop