fix for addButton - it wasn't taking into account @where/@whereOr