[BUGFIX] Better constant and iframe handling