Adjusted model and updated filters

The model is now more generic and I added a new filter called
locality_uniqueness