Filter allowed permissions consistently

Squashed commit of the following:

commit 9d5efccbec18cdedc18ccb22f66f27efa4e4d8b0
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Mar 26 14:20:14 2014 +0100

    Fix controller

commit d80f763870322b6e252a66877f1c80ddbc802fca
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Mar 26 14:14:19 2014 +0100

    ...

commit 96c221bdb4a40e6866b533feb63e41776b769dff
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Mar 26 13:51:43 2014 +0100