Some conditions were not evaluating correctly as we are passing
empty strings instead of null/undefined values. We replaced the
nullish coellish operator with a simple or operator until we have
more time to review the incorrect use of empty strings in oppose of null
and undefined values in the entire app
Change-Id: Ifb8635976166830e0d32b88a27985a7661854acb