Merge pull request #697 from hegek87/havoc

Tabs on group and tags page working properly (except search)
Merge remote-tracking branch 'upstream/havoc' into havoc