query and parsing fixes, stub for page load filter