enhancing the query builders with prefix support