LFP select improvements finish [wip]