Fix filtering of useless attributes
Fix multiple registrations of Resource Servers. Fix resources cleaned on restart
Merge with server fixes