Added filtering queries and form post