Proper URL query handling