SUP-512 - fixing filtering logic, also logic to add new row