Updated the AQP engine, added in rule based filters