Updated UI so that it takes into account the similar queries