WIP - Fix Query Params List
WIP - New build