FIX: index client by engine id instead of direct view