Fix merge
Change in query to or query