Remove extra query and keep tab instead of space