Fixing and adding some rules to the view map