Merge pull request #775 from tonyrd/development

patched year filter, showing all if nothing is returned
hide service inc calc button