Added in refactored loop.

[Branch: dev1.2.5]
Commited the fix for the options reset and query.

The Query page is now fixed and paginating properly.

The options now reset properly.

[Branch: dev1.2.4]
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework into beta