Remove tables from includes on index query which are not needed an resul...

...t in bad performance with many Variants #4490 and #5060