New hardpoint filters and fixes to datablock layout