Improved selecting by id