LAI-7 & LAI-15

Testing and Query Performance tweaking.