Avoid problems with empty strings and zeroes in filters
Avoid problems with empty strings and zeroes in filters

UPDDI/mps-database-server,UPDDI/mps-database-server,UPDDI/mps-database-server,UPDDI/mps-database-server