Updated filter values method to work with the new db structure