Added starting array values, further optimized queries