*8774* Fixed grid and feature js errors