Patching issue with there being a difference between NULL and and empty string...

Patching issue with there being a difference between NULL and and empty string WRT description and also plugged a gap in the code when we were trying to query using a display_label which the api allows to be NULL but the DB does not