Fix for queries with includes/joins that contain as search term string containing dots