Optimise context queries
Updated README