Limiting highlights to 15 on server as well
Merge pull request #270 from squix78/DevBranch

Limiting highlights to 15 on server as well