RCM-64:Finish creating SQL filter