Added filtering options for store data