Improved expression

There is no need to make a second check if sth should be added, do it in
the first. Nothing needs to be added if not true

 * Added some keys were nothing should happen

Change-Id: I37453f4dc8c452055ce4b5b69b53e43787ccf685