now displaying search results in play mode
merged conflicts