Update Services add includes concept

Includes concept permit to ask entries with relashionships
Apply includes on controllers
Cleanup and debug