BUG 2245 - Fixed Collapsible If Statements

Change-Id: Idee4d65869ed7041fde16706b4fb8bea2f77bfdd
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>