add a few more indexes. This is just a first step. More work is needed here...

add a few more indexes. This is just a first step. More work is needed here but this should improve perfomance already for big installations.