implemented ad-hoc solution for awkward query answering