#154 Improve performance of /scripts