major bug fix on shortcut attributes parsing
bugfixs + cleanings