Reordered methods
Made Filter class final
Made request building more robust.