Split and improve primerquery system