Fixed not to append ? when no query attached