Fix for ambassador js, limit search to context