Fix for filter with uuid that's not a primary key

Fix for filter with uuid that's not a primary key #572