Capability Fix

Improve capability searching performance on entities