Fixes for binary files and query string URLs