(inc) completes basic refactor on user query