Added aliases to avoid clashes with 'role' and 'site'
Use EditBlock if form cannot be resolved
Added view
Added 'username' facet